RE-WORK FINISHED ON APS!!!