this is reverted manually from old version
and console.log removed