Updated template to match current state