added wind
added wind, and merged