Some minor changes?