reorganizing and making more complete for CEP submittal