Updating so that command line version works with Bill's configuration update