removed shadowing