renamed and broke out lists