improving bots handling