Updated version + removed console.log