Changes to mock-up