Updates to Drawing.java