Made Some changes
gfeger