Remove the wrapping draw function, it seems confusing.