changed conflicting variable name