redid setter a bit