Updated latest and removed dependency on external software