adding options default and renaming