Add FYP and Update EMD