reorganized the initiation of the two classes, considering merging the two classes