standard drawing bug fix, duty dependency structure - not dealing with yet in code