Keith's changes for studentwed2 @ 2:15pm