better crosslinking, ready for @callback...