More changes. Starting to think behavior is not going to be preserved.