More organization and normalization of APP APC and APS