Fine Tune Update

Lines 338-340