(Much) more advanced skirting logic