Submitted Version

Chronos code submitted after Gateway 2