new files added, changes made for 2.6 version