Updated for branch_4