done working on prelim 11/7