upgraded six to match latest version