Updated to new python-combined