updated base template because of #105