adapt to new BSH server