add edit to command, rearrange