general classes updated