variable names have been updated with better on