New mockup changes