Massive number of changes made and scenario 62 added