Improved onSelect bots