rename  and  option to ,  #7