redid some stuff