simplified the class