Making changes to reflect new expanded range of analysis options.