Some changes to the first commit