Updated mock-up