Updates with respect to Peter's comments