Submitting billing server re-write