cleaned up patch, ran all integration tests, all pass