changed analysis and displkay