Additional modifications of program