Added ability to change and set bill id