next version with new template