Re-added diagonal dodging