Back to no-pointers-version