Fixed newly added drawing functions to be regex based