Possibly broke some more components