hopefully i made things better in this commit