Some changes in initial code