Updated to more current versions