Too dirty, rewrite for the mass !