changes to run standalone