removed more variables