new commands and rearrangement