Merge with line 82?