Some minor changes in structure