Update to match what we want