Revamped with template insert