Finally implemented optional survey