Remove changed
Add template