C13 : Add function and some cleaning