AMSO and CPSOR added