fixing my tired mistakes