Now supports CIGARS with P
Now supports CIGARs with N