Updating template and fixing bad merge from t5