Minor changes and modifications