Made important changes.

Very important!