some more integration work for previous commit