Switched to one_way flag