Changing pointers to & in some places