STILL FIXING POOP