more updates to origin validation