bring in Karen's changes