i think i changed a bunch of stuff