New files for version 3