modified some class, add afinal