Updated sending electives checked + major cleanup