changed server to use APS class