Survey updated and tested