Minor Adjustments :-)