Previous commit added the libraries, this commit contains the modified source code