Changed mapping to n/p