merged mockup code