Minor changes in structure