Change code to use IBOs.