Logic changed and entire patch resubmitted.