Some changes

More commitment.