Incorporate changes to draw library.