Added wind and better field application
Merge done