saedi cleaned up the variable names