Might have fixed cohesion and broke some other stuff