renamed things to make a little more sense