new mock-up, modified old mock-up