modified template
tweaks