Make free electives work