Made crucial changes.