NoDraw Add and BugFix