Updated, minified and adjusted