amdin commit 7 / 10