final changes before a big update in the public_api