Improved timing for demo