[RFC] Fix/base partner