Scope redesign

by Pierre Henrion