minified and corrected