Can we change this to a class plz