~tm85/bectes

ref: 698ed4c330ab9ba2d88caad0c383eec12ca1cd49 bectes/kra d--------- 
batch 2 + tweak some