Updated MOCKUP_v1.1