Resubmit of Drawings.cs