Jared changed some vars