updated with vars