redid a lot of stuff