Changed a class around, because of conflicts.