diff --git a/examples/background_task.py b/examples/background_task.py
index f6d7abcfa..a7da6fc77 100644
--- a/examples/background_task.py
+++ b/examples/background_task.py
@@ -15,7 +15,7 @@ class MyClient(discord.Client):
         print('------')
 
     async def my_background_task(self):
-        await self.wait_until_ready()
+        await self.wait_for('ready')
         counter = 0
         channel = self.get_channel(1234567) # channel ID goes here
         while not self.is_closed:
diff --git a/examples/guessing_game.py b/examples/guessing_game.py
index 550fa1857..a8f09c637 100644
--- a/examples/guessing_game.py
+++ b/examples/guessing_game.py
@@ -1,5 +1,6 @@
 import discord
 import random
+import asyncio
 
 class MyClient(discord.Client):
     async def on_ready(self):
@@ -15,13 +16,16 @@ class MyClient(discord.Client):
 
         if message.content.startswith('$guess'):
             await message.channel.send('Guess a number between 1 and 10.')
-            check = lambda m: m.content.isdigit()
-            guess = await self.wait_for_message(author=message.author, check=check, timeout=5.0)
+
+            def is_correct(m):
+                return m.author == message.author and m.content.isdigit()
 
             answer = random.randint(1, 10)
-            if guess is not None:
-                await message.channel.send('Sorry, you took too long it was {}.'.format(answer))
-                return
+
+            try:
+                guess = await self.wait_for('message', check=is_correct, timeout=5.0)
+            except asyncio.TimeoutError:
+                return await message.channel.send('Sorry, you took too long it was {}.'.format(answer))
 
             if int(guess.content) == answer:
                 await message.channel.send('You are right!')