master: modified for chronos