Fix drawing to be in the general function