Changes to the libraries and the main program