Add command and some edit