Some slight changes and testing.