Added V3 and cleaned V2.