Redid everything again