Update by erik
console.log removed