committing old incubator changes, it seems