Fixed some errors with selected leg
Merge Attempt
::