code arrangement

with marriage and depart_date