Upgraded to latest versions