Upgraded to latest libraries