Merge "implement finish"