made some classes final