reorganized commands