I think I messed up and this my attempt to remedy it