some changes Dongliang made