modified some class