Played around with new template