improved timing