diff --git a/bot.go b/bot.go
index 2a3f063..df80893 100644
--- a/bot.go
+++ b/bot.go
@@ -270,11 +270,10 @@ func botListParsingRule(m *tb.Message) {
 }
 
 func botTimer(m *tb.Message) {
-	r := regexp.MustCompile("^((?P<Hour>[0-9]{2})h){0,1}((?P<Minute>[0-9]{2})m){0,1}((?P<Second>[0-9]{2})s){0,1} \"(?P<Msg>(.*))\"$")
+	r := regexp.MustCompile("^(?P<Duration>([0-9]*(s|m|h))+) \"(?P<Msg>(.*))\"$")
 	if r.MatchString(m.Payload) {
-		log.Printf("Timer : Hour : %s\n", r.ReplaceAllString(m.Payload, "${Hour}"))
-		log.Printf("Timer : Minute : %s\n", r.ReplaceAllString(m.Payload, "${Minute}"))
-		log.Printf("Timer : Second : %s\n", r.ReplaceAllString(m.Payload, "${Second}"))
+		h, _ := strconv.ParseInt(r.ReplaceAllString(m.Payload, "${Hour}"), 10, 32)
+		log.Printf("Timer : Duration : %s\n", r.ReplaceAllString(m.Payload, "${Duration}"))
 		log.Printf("Timer : Msg : %s\n", r.ReplaceAllString(m.Payload, "${Msg}"))
 	}
 	/*