Updated for Khepri V1.2.4