Changing pointers to refs here and there