Little changes, changed cmd options