Updated to new template