Minor adjustments left