diff --git a/fahdbot b/fahdbot
new file mode 100755
index 0000000..bbcb687
Binary files /dev/null and b/fahdbot differ
diff --git a/main.go b/main.go
index b5f8064..31fdce5 100644
--- a/main.go
+++ b/main.go
@@ -90,7 +90,7 @@ func commandListener(event *events.ApplicationCommandInteractionCreate) {
 	if data.CommandName() == "schedule" {
 		err := event.CreateMessage(
 			discord.NewMessageCreateBuilder().
-				SetContent(fmt.Sprintf("Will you attend on %s?\nAttending:\n\nNot Attending:\n", data.String("date"))).
+				SetContent(fmt.Sprintf("Will you attend on %s?\nAttending:\n\nNot Attending:\n\n", data.String("date"))).
 				AddActionRow(
 					discord.ButtonComponent{
 						Style:    discord.ButtonStylePrimary,
@@ -115,18 +115,23 @@ func interactListener(event *events.ComponentInteractionCreate) {
 	switch event.ButtonInteractionData().CustomID() {
 	case "attend":
 		currentcontent := event.Message.Content
+		msg := strings.ReplaceAll(currentcontent, event.User().Username+"\n", "")
+		msg = strings.ReplaceAll(msg, event.User().Username, "")
+		msg = strings.ReplaceAll(msg, "\nAttending:\n", fmt.Sprintf("\nAttending:\n%s\n", event.User().Username))
 		event.UpdateMessage(discord.NewMessageUpdateBuilder().
-			SetContent(strings.ReplaceAll(currentcontent, event.User().Username, "")).
-			SetContent(strings.ReplaceAll(currentcontent, "Attending:\n", fmt.Sprintf("Attending:\n%s\n", event.User().Username))).
-			SetContentf("%s\n%s\n", currentcontent, event.User().Username).
+			SetContent(msg).
 			Build(),
 		)
+		return
 	case "noattend":
 		currentcontent := event.Message.Content
+		msg := strings.ReplaceAll(currentcontent, event.User().Username+"\n", "")
+		msg = strings.ReplaceAll(msg, event.User().Username, "")
+		msg = strings.ReplaceAll(msg, "Not Attending:", fmt.Sprintf("Not Attending:\n%s", event.User().Username))
 		event.UpdateMessage(discord.NewMessageUpdateBuilder().
-			SetContent(strings.ReplaceAll(currentcontent, event.User().Username, "")).
-			SetContent(strings.ReplaceAll(currentcontent, "Not Attending:\n", fmt.Sprintf("Not Attending:\n%s\n", event.User().Username))).
+			SetContent(msg).
 			Build(),
 		)
+		return
 	}
 }