NIM addition + small adjustments (4-19)