Updated template to personal preference