Roll tack.Keep the main sheet tight right untill head to wind.Don't let the rudders straighten out during the tack.Have the crew play the jib thru the tack.That is let a little off so it crosses the mast then release it slowly and bring it in quick.When the crew does bring in the jib,don't have it too flat .Practice lots.