fix dp problem and rm pbj