Changed lines to use non-static reference