Fix and Enhance: For fast, but only 1000 messages