Minor changes and transformations