changed structure, added minified version