Minor changes to reflect final implementation plan