Updated to end of class