:lipstick: refactor to have more explicit  rels