merging work on build_survey and majo_rsa