trying to merge with diane's 582 pull