Minor changes. Additional options.