change name, add option