Change from TextCommand to WindowCommand