Updated to newest versions