Added more rrrrrobustness to the skill chooser
Pushing to local client