renamed variables and functions... great