Apm 231 final with friendly amendments from first reading