KGW fix and checkpoint added