Some modifications!