Minor adjustment
Merge with minor adjustments