Completed 18 merged into one file