fixing EVERYTHING again