U06 & U07 added