Updated for khepri V1.1.1
Updated for V1.1.3