Add CGP for mdapt as well + add updated shaders