added some new fucking shit that doesn't even work