Bot logic for following improved