MB-146 #Changed variables to make more sense