Adding more variables; renaming