Fixing vars-out, not ready yet