Latest changes for checkin for Stan & Harry