Map Changes

APC Map Fixes