adding own changes, hopefully i dont fuck this up