redid the entire thing