Some changes in the first 50 lines