Updated windmill form