reorganized commands, true command context