changed templates to use mockup code