Some more changes to the program