Updates to yoke
Restsructing yoke using commander