Kaai rework part I