Much better drawing but need better spacing etc