A few modifications and additions