added list only and some output formatting