Refactor to use sublist.