Modified X.java