turned into a class