fixing my terrible mistakes