merge julycoolwind code