Fixed merge conflict and moved the design forward