Working on residuals
merged conflicts