Updated to newer versions