diff --git a/main.go b/main.go
index cb3afd6..b331f2a 100644
--- a/main.go
+++ b/main.go
@@ -175,9 +175,10 @@ func main() { // {{{
 } // }}}
 func scheduleHandler() { // {{{
 	// Wait for the approximate minute.
-	wait := 60000 - time.Now().Sub(time.Now().Truncate(time.Minute)).Milliseconds()
-	time.Sleep(time.Millisecond * time.Duration(wait))
+	//wait := 60000 - time.Now().Sub(time.Now().Truncate(time.Minute)).Milliseconds()
+	//time.Sleep(time.Millisecond * time.Duration(wait))
 	tick := time.NewTicker(time.Minute)
+	tick = time.NewTicker(time.Second*5)
 	for {
 		<-tick.C
 		for _, event := range ExpiredSchedules() {
@@ -760,6 +761,7 @@ func keyCounter(w http.ResponseWriter, r *http.Request, sess *session.T) { // {{
 	})
 } // }}}
 
+
 func notificationAcknowledge(w http.ResponseWriter, r *http.Request, sess *session.T) { // {{{
 	logger.Info("webserver", "request", "/notification/ack")
 	var err error
diff --git a/notification/pkg.go b/notification/pkg.go
index b74a6b1..5732f31 100644
--- a/notification/pkg.go
+++ b/notification/pkg.go
@@ -44,7 +44,6 @@ func (nm *Manager) AddService(userID int, service Service) {
 }
 
 func (nm *Manager) Send(userID int, uuid string, msg []byte) (err error) {
-
 	services, found := nm.services[userID]
 	if !found {
 		return werr.New("No notification services defined for user ID %d", userID).WithCode("002-0008")
diff --git a/version b/version
index 5502a04..53d1c14 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v23
+v22