Revert "Revert "Improved kcheck - done by mistake""

This reverts commit d1687dbb5e6ae3a7d57e91ec2095dcaf627a64f7.