rearranged commands to group tasks types better