some changes, fleshing out