changed to a class