Refined previous segment code, added V1 segment efforts

Summary:

Test Plan:

Reviewers:

CC: