update before class. Remove good