add ee-class
convert to using ee-class