Advanced Salsa Newyork steps with Windmill variations

In 38th class we learnt Advanced Salsa Newyork steps with Windmill variations:

1: Male partner starts by doing open break and making C loop with his left hand.
2: Open break step 2.
3: Open break step 3. His left hand holding her right hand reaches over top of their head levels.
5: He does a side basic with his right foot, while she starts doing a clockwise (right) 360 degrees turn. He leaves her left hand.
6: He shifts weight to his left foot. She continues doing right turn.
7: He pushes his right foot to get momentum to do a quick 180 degrees counter-clockwise (left) turn. During rotation, his left hand keeps on holding her right hand over his head. She completes her right turn. At end of his turn, he leaves her right hand. Both partners are now facing same direction. She lets her right hand come down and he holds it with his right hand (brought behind his back).

1: Side step 1. Both partners do side steps, with him holding her right hand with his right hand. He starts by doing it with his left foot, while she starts with her right foot.
2: Side step 2.
3: Side step 3.
5: Side step 5.
6: Side step 6.
7: Side step 7.

1: Basic step 1. He goes forward with his left foot, while she goes back with her right foot.
2: Basic step 2.
3: Basic step 3. He raises his right arm straight above and going a bit far right (making some 20 degrees angle from his standing line). She also has to make it sure that her right hand goes up straight. This is the lead for windmill rotations.
5: He goes back with his right foot and starts doing clockwise rotations with his hands (like rotating windmill). The windmill rotations are not exactly in line of his standing line, but rotated 20 degrees. She starts doing clockwise turns by overlapping her right foot by her left foot. In total, she has to make 1.5 clockwise (right) turns.
6: Basic step 6 for him, while continue rotating his right hand and her.
7: Basic step 7 for him. She completes 1.5 left turns and then both partners switch hands, so that his left hand now holds her right hand and vice versa.

Following video shows the steps: