More lab7 MAP edits