change by dev20 for list