Now works in both directions