Origin changes

Changes from the main project