New files to handle final stages