Refactored to default template