Updated mockup