modded foo
merged/fixed foo