updated all items based on meeting from March 13th