Updated to the latest versions