Added scalar, updated M usage