Large SCENAR patches

Large SCENAR patches