Changes to run standalone.