added where variable naming