duplicate v2 files, various updates