Underscore added. Minor changes