Revised version of 2P218.1 and MAI/2P218.5