Version 0.8: improved timing