Completed code changes to combine into one extension.