expressions templating updated and functional