Draw functionality works well now