Gabriel's Changes to ScopePlan made