minor changes in structure