closing #28 & some staff for #29