Update 2 - Design