Updates to drawing package

@ 42f7af87e52e8c128f0a19c07341d7c1c19b1083