zsnm2: Late day edits