renamed conflicting variables