Minor changes and facilitating