Updated after minification experiment.