Refactor c2c experience