Small changes in all of my classes