fixed messed up part