Made changes to sort out Git Issue