Fixing AreaMap
* Testing AreaMap
!BROKEN BUILD!