change leg to array
Merge branch 'Eran'