Ok, this version branches properly...