Massive changes. They seem to be working...