Added working survey functionality