changed all timing things