revised and minified