Minor changes
Minor changes part 2