updated and broke some stuff