Existing modified with lists, new still in progress