this to collider fixed
More shared_ptr
Merge branch 'Jimmy'