Knockout setup
After merge