Changed dumb references to good pointers.