Will and gift deed

My GrandFather has 3 properties( A, B, C). He has written a will(veelunama) of declaration for all the 3(A,B,C) properties to be inherited by his wife (my grand mother) after his death, in 2000. Later in 2002 he has again registered as gift deed one property B, to his daughter and there was no alteration done to the will(veelunama). My grandfather later expired in 2009 without any modification to the Will(veelunama) which was written in 2000. Now who is the legal heir of the property B. Grandfather's daughter or grandfather's wife. Assuming daughter is legal heir of B. If grand mother now wants to write the gift deed to her son for remainig properties A and C which as per dated year 2000Will (veelunam) are owned by her. My GrandFather has 3 properties( A, B, C). In year 2002 He has written a will(veelunama) of declaration for all the 3(A,B,C) properties to be inherited by his wife (my grand mother) after his death. Later in year 2004 he has again registered as gift deed one property B, to his daughter and there was no alteration done to the will(veelunama). My grandfather later expired in 2011. without any modification to the Will(veelunama) which was written in 2002. Now who is the legal heir of the property B. Grandfather's daughter or grandfather's wife. Assuming daughter is legal heir of B. If grand mother now wants to write the gift deed to her son for remainig properties A and C which as per dated year 2002 Will (veelunam) are owned by her. Can she include in the gift deed now that in 2002 i was made legal heir for A,B,C and in 2004 B was gifted to my daughter so i inherited remaining A and C now i am gifting to my son A and C. By writing so will there be any problem? Does the (Will) veelunama written in 2002 stands cancelled ? After the 2004 gift deed of Property B to daughter. As there is modification in the property that grandmother can inherit post 2002 gift deed. And there is no new Will ( veelunama) was written after the modification that only A and C are left and she can inherit only A and C.