End of class changes