Better watching; Require Ristretto 0.1.6