Merged with upstream, added lists