Big revision and analysis changes