minor structural changes, all results in a list