SOme minor changes in structure