changed everything to use the same timescale