End of class updates