version two with all files