imported util.list where needed, no errors after merge.