redid some things