changed the C++/Python  bindings