A few changes to the program