Merge "Use pointers instead of references because C"