removed all this-> refs ... -sai