improved timing a little bit