[wip] EGSZ2, cleaning up adaptive algorithm and marking