personal-template logic change