changed n to N
fixed merge issues