Finish the origin functionality