End of class
more changes