not done yet, but changes made from meeting on Friday