Feature ks

We can think about that change later.