Finished code changes.