Redid some stuff