updated 6-11-07