Broken map parts 6 and 7 (redo)