Fixed: changed some variable names for more prep into generalization