Renamed variables to reflect change in logic