more templates done