exchanged boost pointers with regular pointers in some functions