First attempt to fix deformation issues + partial MM support