remove some shadowing
first time in