Kien v2.0 changes

In Progress