Most of the MEMSAP changes