Functionnal project need some polishing!