Also need to change the class here.