Third Revision of Plan

Revised more aspects of the plan and revert deletions that should not
have been deleted