changing from map as collection to list