renamed a few things to make more sense