Refactored draw skirmish