Merging changes to prototype survey