Added toList
Fix toList order