remove NONE from templates
upped version