Changes made as of some testing done.