minified version with recent changes