Improvements, minified version