Initial adjustments and commit