Started working on 2.3 verification