Undid the changes with DrawAction, seems clumsy