v4 of thesis, without aperture bug fix