Updated for Khepri V1.0.7