Mario's change of SubStave -> HalfStave, to be reverted