Most of MEMSAP changes