still fixing timing