removed raw pointers in parse