merge in changes from cazfi.