Modify fill all command and add fold commands