Change code to use null ACRs to avoid lots of if tests