updatedRon Gagnon's prelim notes