Now I should have fixed everything I didn't forget