Some minor changes !