Updated with notes for May 21