Readded my map changes back in (Fuck everything about this)