Now let's flip to the new syntax (that wasn't there back then I think). And let's merge it already.