Fixing removeN & addN