both secondary and primary codes are now lists