PB + SWMH changes