diff --git a/Xiao.js b/Xiao.js
index 9134be3f..e0f22389 100644
--- a/Xiao.js
+++ b/Xiao.js
@@ -303,15 +303,15 @@ client.on('messageCreate', async msg => {
 		msg.channel.sendTyping().catch(() => null);
 		try {
 			const response = await cleverbot.respond(msg.cleanContent);
-			await msg.channel.send(response);
+			await msg.reply(response);
 			return;
 		} catch (err) {
 			if (err.status === 503) {
-				await msg.channel.send('Monthly API limit reached. Ending conversation.');
+				await msg.reply('Monthly API limit reached. Ending conversation.');
 				client.cleverbots.delete(msg.channel.id);
 				return;
 			}
-			await msg.channel.send('Sorry, blacked out there for a second. Come again?');
+			await msg.reply('Sorry, blacked out there for a second. Come again?');
 			return;
 		}
 	}
diff --git a/commands/cleverbot/cleverbot.js b/commands/cleverbot/cleverbot.js
index e8af98d8..efa91806 100644
--- a/commands/cleverbot/cleverbot.js
+++ b/commands/cleverbot/cleverbot.js
@@ -17,15 +17,34 @@ module.exports = class CleverbotCommand extends Command {
 					reason: 'API',
 					reasonURL: 'https://www.cleverbot.com/api/'
 				}
+			],
+			args: [
+				{
+					key: 'text',
+					type: 'string',
+					default: ''
+				}
 			]
 		});
 	}
 
-	run(msg) {
+	async run(msg, { text }) {
 		if (this.client.cleverbots.has(msg.channel.id)) {
 			return msg.say('There is already a Cleverbot conversation in this channel.');
 		}
 		const cleverbot = new Cleverbot(this.client, msg.channel.id, msg.author.id);
+		if (text) {
+			msg.channel.sendTyping().catch(() => null);
+			try {
+				const response = await cleverbot.respond(text);
+				return msg.reply(response);
+			} catch (err) {
+				if (err.status === 503) {
+					return msg.reply('Monthly API limit reached. Ending conversation.');
+				}
+				return msg.reply('Sorry, blacked out there for a second. Come again?');
+			}
+		}
 		this.client.cleverbots.set(msg.channel.id, cleverbot);
 		const usage = this.client.registry.commands.get('cleverbot-end').usage();
 		return msg.reply(stripIndents`
diff --git a/package.json b/package.json
index 50053890..f22532c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "151.1.0",
+	"version": "151.2.0",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"private": true,