New options and code improvment