update aehrraid
fail rework
merge