Updated Mockup