Map patch 6 [Done, not optimised]