changed commands to use uicommands