Fixed error, added vars