moved more variables over