Final Code Changes Part - 1