phew
on-the-fly time modification introduced
some stuff merged