Added more audit to figure out what's going on...