HopFrog: second trial commit