Adding better drawing