Changes based on 3/6 Example Task Force discussion