Changed some pointers to variables.