Updated for pointers v1.1