Simplified code a bit more.
Watch and restart server, too.