Committing for Peter to look at Ptr stuff