changed and messed up some stuff