renamed shadowed variables