Changes to use pointers instead of Int.