Some changes for a class that will come in near future.