Changed from github v6