New files with updated Logic