Update Mockup after Meeting #1