Scope management corrected