more use of RawPtr