I will let @lslezak to check it after his changes to control file, what is still correct and what no longer. I just want to have easy format to see differences when viewing changes.