Little changes in structure of program