Minor changes and added output