2 files modified from Local_GIR_Repo branch