Stop adding default values everytime
moved template out of other functions