Replace origin code with a better subscription