new templates
fine tuning