One more update, fixing nested lists