transforming every command to use yield, removing useless debug msgs