Did better mockup