Rearrange some stuff to get CDMA data to work properly