Drawutils changes