Nevermind it's the second one. His choreography wasn't as elaborate in the beginning but it flowed better. Bey's choreographer did too much with the african style footwork and it took away from her sleekness. It made her move a lot more heavy because it calls for such quick movements.
Still, she did a great job learning the choreo. I just wish she picked a different chreographer.