switch to new mount system, use more safety mount options