Trailing spaces
Add incremental_template