Trying to fix time scaling