Minor modifications for N