More Moom changes