Last changes for mom4