improve commands;