Small Adjustments to make more robust.