minor change on how origins are stored