this class will be removed soon