Now uses proper input files