Can this be moved into ```marmalade_priv``` above?