wind mills backported and adjusted

Update to pitriss's backport