Updates by FidC&ANUU

FidC&ANUU