Redid a lot of stuff