b4 further changes