wal: more impreve