--more changes to code for AMGA-15