Solving conflicts
Update several functions (from P8 to P10)