further changes #3785