CLSN-2080 : moved list to function