Update to include oustanding PR's