Merged changes from #240 into new map

Merged the changes from #240 into the new map. Due to them being broken
due to the Baystation Merge