Some minor modifications;