Some changes i did