changed some Bmi
merge