Changes to get this to work the way we'd like