wal: more more improve