Major update for elective choosing + sending