Minified changes

Tests pass.