Updates to attempt to wrap around the 2d map