Mock-up changes