Make sure hex map is used where needed