some changes, initial outline