Removed v1 logic