Minor adjustments!