2 templace changes