Added user enabled feature to every analysis where it is appropriate.