A few modifications