Set origin (8/18)

Set origin