Faster but the order is again incorrect, sorry