Updated template and added connect