Redid a lot of everything