made modifications recommended by Analyze