added revisions from meeting at MAPC