More things working on the survey