Last minute optimization (200% faster, wooooo !)