future upgrade of the classes