a06 + a07 added