changes to load-stream