made list building only for test situation