Improvements for KPN

< KPN