completing migration to drawhelper