Reworking the pointers.