made some changes, broke some things