Improved timing, added billing