redid some stuff.