A few modifications/updates