Updated Design Plan