improved warp.time - seems to work