M21 and some scope transition changes