MOM : Revamped again several sections