Followup Master Plan

@