Update kaji, hope to finish it tomorrow