Hopefully all timing issues fixed.