Added in the latest fixes/changes