Some changes taby made.