This class is redundant in the new version...