changed command dispatch handling