changes I shoudl have done a whiel ago