and replaced origin setters / getters with properties