reverted chenges to Draw2