latest changes to run using supervisor