#24 - add support for change of origin