added timescales and version 2