fixed patch and added fields for contact address