Improved (read: shortened) new template