Integration

integrating all templates