Modify Draw polygen to manipulate handler