Grp80 no40

Please review the changes done.