I was dx with both at separate times in my life. Because I had a manic episode he removed the bpd dx.