edited 11-06