if that's not best practice I can change