Modified Class.java