CHANGE: single responsability princpiple applied to all classes