Rewrite again the packaging