Update to put in a class