Improved PNCondition management a little bit