small changes in different classes