Improvements in transformation and templates
2nd phase transformation