AP Changes #001

Changes for the AP Server