af39f26360
also edit var names from recent commit to better fit with other functions.
also edit var names from recent commit to better fit with other functions.