Changes for xh and bh modes