redid pretty much everything