2 Commits (design_plan)