Almost done with V2 logic