made adjustments on 1.3.1