Minor added adjustments