template changes + other