STILL FIXING THINGS