I changed the Draw.java a bit.