My category version -> to be merged if necessary