Some changes and new class.