diff --git a/src/numbers/numbers.go b/src/numbers/numbers.go
index 67b4866..90d2c80 100644
--- a/src/numbers/numbers.go
+++ b/src/numbers/numbers.go
@@ -20,18 +20,21 @@ type Numbers struct {
 }
 
 // The maximum response time of the handlers.
-var MaxResponseTime time.Duration = 500 * time.Millisecond
+var MaxResponseTime time.Duration = 450 * time.Millisecond
 
 // The main entry point of the backend.
 func main() {
-	listenAddr := flag.String("http.addr", ":8090", "http listen address")
-	flag.Parse()
-
 	http.HandleFunc("/numbers", func(w http.ResponseWriter, r *http.Request) {
 		numbersHandler(w, r)
 	})
 
-	log.Fatal(http.ListenAndServe(*listenAddr, nil))
+	s := &http.Server{
+		Addr:         ":8090",
+		ReadTimeout:  2 * time.Second,
+		WriteTimeout: 500 * time.Millisecond,
+	}
+
+	log.Fatal(s.ListenAndServe())
 }
 
 // The main handler. The expected request is of the form: