Some minor modifications!