Change to PolyKinds mechanism, remove N tag