Adaptations to the draw workflows. It introduced some new bugs