renamed clashing variables