Changes in wrapper functions for KC1/KS1