changes from non-minified version