Updated to include all libraries and hopefully make the solution more portable