Template tweaked a bit