pull in latest changes from cazfi.