Increased buffer size and removed unnecessary header