Redoing somethings on WVUP assignment

still not close to fixed!