moved restart to Self and added siblings support