Fixes part N
Merge