Added display_all flag