added the latest stuff from chronus