Added stuff from Chronus