modified Dorian.java