hopefully i fixed everything