incorporated previous templates