updated lists to adopt approach 1 for issue #35