Use command and some renaming