redid some things, hoping for no merge conflict