Some changes after class