Redid lots of stuff