updated on some classes