Added some needed changes.