Redid some things