MCP: more sensible version of previous commit, and better behaviour for play button...