Improved performance (resend stuff)