N21, N550 and N551 changes