Refactor to split diamond to survey2