Update to include outstanding PR's