updated for bspkrsCore and Treecap stuffs