improved mockup