leo's addition for jenny conflict